builder: Cosmetic changes
authorMatthias Clasen <mclasen@redhat.com>
Mon, 19 Oct 2015 18:58:35 +0000 (14:58 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 20 Oct 2015 10:14:57 +0000 (06:14 -0400)
Use an iter instead of g_hash_table_forall.

gtk/gtkbuilder.c

index 5b61334009d940d274bfd400653a33aa8ebf905b..d6722a0cfb8c45b19aa35f906ffe85fe95a57942 100644 (file)
@@ -1445,14 +1445,6 @@ gtk_builder_get_object (GtkBuilder  *builder,
   return g_hash_table_lookup (builder->priv->objects, name);
 }
 
-static void
-object_add_to_list (gchar    *object_id,
-                    GObject  *object,
-                    GSList  **list)
-{
-  *list = g_slist_prepend (*list, object);
-}
-
 /**
  * gtk_builder_get_objects:
  * @builder: a #GtkBuilder
@@ -1471,10 +1463,14 @@ GSList *
 gtk_builder_get_objects (GtkBuilder *builder)
 {
   GSList *objects = NULL;
+  GObject *object;
+  GHashTableIter iter;
 
   g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
-  g_hash_table_foreach (builder->priv->objects, (GHFunc)object_add_to_list, &objects);
+  g_hash_table_iter_init (&iter, builder->priv->objects);
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&object))
+    objects = g_slist_prepend (objects, object);
 
   return g_slist_reverse (objects);
 }